merge trunk
authorKenichi Handa <handa@m17n.org>
Fri, 4 Nov 2011 05:56:41 +0000 (14:56 +0900)
committerKenichi Handa <handa@m17n.org>
Fri, 4 Nov 2011 05:56:41 +0000 (14:56 +0900)
commit4268ac15f65d830403e6e247467048a36efef102
treeea1c4526affddd76a960063644ed8536edcaf767
parentb851a434b003d8b1aec39dbeb75401e1cba9c9a9
parenta658e2af9ce103107087006b314788a8c15c1c4b
merge trunk